Can we add a few more `if` statements to remove the redundant normal and tangent computations?