Bug 966457 - Metadata refactor;r=davehunt