Additional syntax cleanup to previous patch.