Simplifying some code for release.