XOP-261: HIMN-related fixes

This is a followup/replacement to #1053 and #1064.