[#2332] Misc. improvements per code change requests.