Fix some compile errors likely introduced in go tip.