FINALLY fixed the error where generic map types don't always have correct base types.