Switched to function builders to allow method chaining.