Split out param name extraction.
Merge pull request #106 from Obvious/jamie-extract-param-names

Split out param name extraction.