Remove ret_style and instead check whether fn return type is bot

On my branch for fn inference I encountered #3681.  Here is a fix.

r? @catamorphism