Convert to new hash syntax