Remove some circumlocuituous syntax