Clean up set_t13n_system function a bit