Refactoring + reduced public interface of SignatureStrategy.
Removed dead code.