Some cleanup and shortening of syntax