Minor refactor of previous patch to avoid using instance of.
Tested with attached sample project, functionality is preserved.

Change-Id: Icfa52ef90a41e1fe63f308b490688c22ebc33cd6
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>