Merge from libexpr

- Incorporated Nibbler changes from libexpr.