Fix nesting, allow keywords to be used in method names