Correct some off-by-one errors, especially when expressions don't contain expected...