Tweak syntax consistency