A few syntax tidy ups