Check for institution type #3608

Also sneaking in a few other minor, unrelated syntax/style corrections.