Fix for integer parsing of params

Fixed a problem in which non-numeric values were getting treated as integers/floats.

I'm having trouble selecting the correct commits for this pull request. It should only include up through ac813dd.