Cleaned up trailing whitespace
Revised query for default effects. This now correctly prunes escaping bound effect vars, and post-scope effects.