Refactored builders into a more concise hierarchy.