STORM-1919: Fixed snapping of rotation in the edge-on case

Simply had to guard the snapping code, making sure that the last "else" case was preserved when either the outer or the inner tests failed.