Merge pull request #3431 from ZappoMan/fixRotatedStatic

clean up the weak side/delay code to be more readable.