Here is patch #3, the main patch.

This version has some fixes from Joel in it, plus making the
FILE:FUNCTION:LINE canonical form be Ada-specific.

Tom