Clean up the mock string handling.