Fixing issue #549. Sometimes a non typed variable in a KApp wouldn't be wrapped with a KLabel object.
   - added a check which ads it after disambiguation.
Checking only for the sort information.
Merge pull request #593 from kframework/fix-i549

Fix i549, latest fix worked.