Leaves some tests in Roman broken, but better code.