Refactoring + duplicate changes.
Closes #36 - Variable completion from imported files missing.