Remove ret_style

I encountered issue #3681 on my branch improving fn inference.  Here is a fix.

r? @catamorphism