Additional changes to deal with empty parameters correctly.

Issue #151