Parameterizing map & list types: step two! Much cleaner now.