More crypter refactorings.