Refactor while trying to chase down the 1230hil* tag absence bug.