Added remaps to improve register usage.