initial work on #1038
more work on #1038
parameters can't have bodies
Merge branch 'master' into 1038
get solution to #1038 to actually work
more refinement fixes related to #1038
cleanup after #1038