Add support for newer Snap and Heist libraries.