Add support for class member variable

supersedes #1417
Then I'll remove it