Preparatory work for key-validity features.