optimization: search type aliases only for type elements
extract method testdata: procedure syntax removed
Merge remote-tracking branch 'origin/master'