Tweaks to the Gounaris-Sakurai lineshape definition to make it match the original definition more closely