It seems a few cases of wrong indentation snuck in here as well.