Refactoring: Merged TraitExistingVariablesChecker into TraitInclusion. Fixes #34