Make simplifications suggested by kibit