C2XS.pm - accommodate Context.pm functions
Context/Context.pm - Further tweaks