Refactored dict and list comprehension remapping

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>