#232 Make returns explicit and early