Removing unused optional parameters and clarifying institution type resolution. #3489