It was a convenient transition macro, but its presence was always intended to be temporary. Expand it to ease the conversion of usage sites that already have access to local player data through a local variable.