Container cleanup.

This takes care of the gallon jug and glass jar problems.