More sign and validate refactoring.