Issue 12086 - unify & improve constraints on remove offset arguments