Parameterizing some MS property-related diagnostics. No functional changes intended.