Energy and Efficiency in the Realignment of Common-Law Water Rights