More expressive variable for define_output_path, and general tidying.