Remove some hardcoding of locations. For #77.