Fix definitions in container functions.