A number of small code and clarity improvements.