Drop lazy-loading and __dirty dict.
Fix popping options in meta_query.