fix embedding of rules with push/pop