JJH:  minor clean-ups.