minor template fixups/cleanups to Container classes to accomodate stricter g++ 4.7