Parameterized generic Map, remove more unnecessary "this." references.