Adjust tests. All pass.
Remove excluded() from core grammar
Relocate ExcludedExpr