fixed recent Containers::Optional cleanup/regression