More improvements. Review candidate #2.