Add support for class member variable

supersedes #1417
Oops, this is my IDE refactoring code. It was nor mean to cross the class member transformer