Minor reorg on exceptions that still need testing.
Merge remote-tracking branch 'origin/master'