Hard tab again.

Also, this appears to be making a test fail -- possibly it is the test that is wrong, but it needs fixing one way or another. Plus there should be a test that this does get raised properly.