Add support for class member variable

supersedes #1417
As it is now, this leaves the member variables if there is no type annotation.