Removed ErrorType.EXPECT, duplicate with EXPECTED; removed TRAP, doesn't seem all that useful. never() can just return false without doing anything.