Ported the sync snappoint detection fix from the 3.0.1 branch. Fixed a pivot unit test that broke with the last style update.