-s now includes the file and line number with info

The option -s now causes file and line number information to be printed
along with any invocation of msg, info, etc...

This will greatly ease debugging.