container: use non-pointer options everywhere