Be stricter about function return types