Convert a few more uses of smart::container

Summary: Missed these when rebasing

Reviewed By: @ottoni

Differential Revision: D1522160