Re-order if() checks for clarity
Comment tweak
Always pass relnatts
Use OffsetNumber type consistently