svq3: Move svq3-specific fields to their own context.