41/74

Added check for SELF_TYPE in formal traversal