Now checking if institution type is actually there #3608
Also sneaking in few other minor, unrelated syntax/style corrections.