Merge pull request #288 from fragmer/master

Cleanup / deobfuscation in Player and related classes.