#1252 Cleaned up Adaptor class
#1252 Moved solver_ in Adaptor to derived classes
#1252 Removed Solver::infix() from public interface
#1252 Fixed lint
#1252 Replaced prefix() in Adaptor with shortname()