remove superfluous space in return without expression
work on #261
comment out code that won't even compile anymore in metamodel tests
tests for #261
fix #261