Fix new PipLib support
Support extensions in statements