Builder: Minor code cleanup