More tweaks to cut down dependencies & build time.