Got first part of return type-checking working.
Made progress on return types.