Refactor Time#advance a bit.