Made things go faster. Still in progress. Expand when now removes

non-referenced declarations that are not instances, but it doesn't work
right now.