Further code tidyup.