Correct deal with exclusion and extensions

Fixes #438

/cc @mikesherov
done