Clean up return types and function prototypes.