Where possible remove computed return types

[cbaggers]

Less ugly hacks in the compiler and easier to reason about