Better defaults for primary + secondary contexts