A redone merge, with what Jaidev thought was best.