Fix the regex and where some things are called.

Lazy dependency management will bite you.