fixed lambda list keywords.

 Modern texinfo implementations do not accept `&' as a valid character
 in macro names anymore. Renamed keywords to `amp-'keyword and fixed
 the macro definitions.