Revert "REVERT ME: Dodgy changes for handling static members."

This reverts commit fb6f0ec014c4f62132713caeb9d5ee85249a559f.
Various fixes for constructors of member classes