FIX: minor code improvements (more consistent way to construct paths).