Improve parameter-handling.