Tidying up of return types from functions and procedures.