Clean up some indents.
Test for 'carp' statements in two locations.