- Minor coding improvements.