add support for complex expressions and implicit getter-style functions
Merge branch 'getter/fns'