1st cut rejig to new code style.