Supercedes previous submission.

Fixed Pedro's issues.  Tested with maint info break.
Regression tested on RHEL5, x86_64.