I might brush up on my regexp and rid the codebase of these.