Minor code cleanup after adding the custom extension loader