Only move functions under return type if constructor like

Fixes #26