Use the optional() strategy instead of one_of(none(), ...) when possible
for the sake of consistency.