More syntax simplifications.