Fixup the frankly crazy class->member coding style (you may choose to disagree with this one).