Add better support for param processing.