Fix handling simple dependencies.

Added accounting to track complex dependency names (i.e. plugin.name)
separately from simple names.