Merge "Only keep methods with correct signature for more types"