types to Map#get(Object), Collection#remove(Object) et al.

This reverts commit 27e2724327c75ddbe7646447a4af212947b149ed and commit
689526016f6ab442680e718d2760fc44e79dd9b5 and part of commit
d516022cc45faaf269239c9a3eb11f62f3444f69