Refactor creator methods and procedural wrappers.