Add Python 3 compatibility by forcing list on map and zip where we need
the execution to happen.