Further code improvements.