I'm removing myself as a reviewer since I don't think I should be blocking this MR, but I'm not so sure about whether I can be considered authoritative on the design either. Sorry.
Please feel free to re-request review if you have any changes (e.g., masking), though.