Make sure Container/File metadata are cleanly separated from other properties

/to @bajtos 
/cc @ritch