Refs #25. More setup file tweaks.