We should support arbitrary options, not just a nil placeholder value.