Continuing syntax adjustments.