Rework choice/conditional logic in fluent API.