Fixes #2321, fixes #2014 -- decode route arguments.