Minor adjustments for greater portability.