Tidy up usage of hardened containers

Fixes https://ripplelabs.atlassian.net/browse/RIPD-380