Refactoring to simplify builder ctors.
Still simpler builder ctors.