[FIX] don't extend literal values
more + better mapping examples