Use variables for source directory in a couple more places.