Some context names now do include '-', so allow it.