Merged outOfBounds with unexpectedType
Clean-up, renaming