Masking and other cleanup for PR.