Refactor to make the handling of special value types easier.