As with r350241 use the new UL macro on the main register mask.
MFC after: 1 week Sponsored by: DARPA, AFRL