Use the new case_N.h file to make sure that our cleanup_step case