Refactor ContextRecord and ModRM into a single class; correct some issues with them