Minor cleanup with container handling.