More tweaks to conda build process.
Minor cleanup.