Functions wrapping classes

I believe this fixes both fat arrow "false positives" when functions wrap classes #249 although I'm sure there's a more readable way to write it. I'm open to suggestions.