refactor(parser): remove hacks and just use instanceMembers