Improved paramter parsing.