Add return type struct to a few places

Next step: hook up the return type struct to the AST.