Fix regression causing incomplete output filepath expansion. #1514