Function return type inference consistency

[dfellis]

Currently there's some weird inconsistencies in function return type inference and explicitly declared return types between multi-line functions and single-line functions. The standard library currently exploits this to get things to compile correctly and work around the lack of proper function types. This needs to be reworked to be a singular form of logic for both so there are no surprises for the users.