Changes needed to make baghash.t work.