HWC: fixup ailiasing violations, credit @bigrushdog for the fixup