Fixing bug where right-sides of key=val pairs contained = signs.