3.5 [XPH] Fix Psion Subclasses and reduce waste. #67