Fix: treat modifierInfo LRSMs the correct way.
Fix: rewrite AAR charge expressions using query_or_insert_expression().
Fix: some compiler warnings.