Fixes 1267 and finishes some partially-migrated code

https://github.com/photonstorm/phaser/issues/1267