Modify context parsing to allow odd-value maps