Cleaning up asserts and file/line macros.