Began to move :has_option code to builder.