bug 2505: more warnings fixes in C4/Context.pm