Adjust to new superclass with internal keystore management.