[minor] Better param stripping.