Small cleanup of the mess the last commit made.