Merge pull request #533 from kareila/5221-warnings

(Bug 5221) More S2-related uninitialized value warnings.