Improve syntax replacing behaviour.