Make ContainsIdentifier code a little bit clear
Update demo
Better support for CONTAINS / REQUIRES
Add USES node (for .dpr)