A little housekeeping before skins fix

Tidied up the code a bit before I add a fix for players using skins that
don't have the right attachment points or bones.