collapsible containers. more closure-compiler support