Add BoolSafe, also apparently some gofmt differences