Merge "Ensure opt. compiler doesn't get core & FP registers mixed up."