Don't want to change signature types for BC reasons.

Great point. Maybe I should switch to an immutable hash map instead, since _dropping_ stuff on insertion won't break things.