Further clean-up and simplification.