Improved error messages for SC2044/SC2045