Further enhancements and simplifications.