Fixed up register width handling.
Tests now pass.