Fix syntax and consistency.