Refactoring and fixing #137 - collecting of mixins to be imported cleaned
up, removed now useless awaitingArguments flag.