Some minor coding improvements.