Refactor more direct manipulation of g_extern.lifecycle_state