Clean up cp15.cpp a little.