Harmonize state holder handlers.