Cross-polinated Solaris-related improvements from python-package.