Tweaks to 1st pass at resource sharing.