Remove old function.
Correct bad offset with spanFrom.
Simplify pattern and type parsing.