Winnowed down the drought code to be easier to deal with.