Tweak things slightly to avoid creating junk.