Some syntax refinements.