Test, fix inconsistency in call handling in dep mapper (reported by Matt Wala)