Fix regex stuff for final cleanup.