reapplied Fred's "recommended style" patch...