Cleaning of asserters to embrace SOLID.