feat: further shaking of Nat/Int/Omega (#3613)

13 files changed