Second round of mods to tackle issue #149 (remove old-style exceptions)