Add support for class member variable

supersedes #1417
Maybe include a static one too?