Fixing up parameter handling.  #414