Remove a self
Fix bug related to stripping whitespace on empty params.