Refactor some New() procs.