Comments explaining the common parameters.  Moving GNATColl parameters to where they belong.  Simplified GNAT rules using source ($<) and target () references.