Clean up the source a wee bit.