Slight cleanup and simplification.