Blargh! MOAR indentation reverting. It's an unholy mess now, but it's as stock as I can get it easily.