Syntax changes to reduce chances of conflicts.