Parts of the code was indented with two spaces while the rest was
indented with four spaces.  Let's use four spaces everywhere.