Clean up usage of current_folder and loaded_folder

Refs #9970.