Hmmm -- I think the branching might actually be more complex. For depth-weighted fixed inverses, we need a `surf_ori=True` inverse in order to get the depth weighting correct. For non-depth-weighted fixed inverses, we need `surf_ori=False` so that the average normal isn't used. Argh...