Fixes uses of unintuitive construct.