Remove regular expression usage from container.

Performance optimisation.