Cleaned up, fixed CA issues.

Changed some contracts residing in classes (compared to interfaces) to use vanilla validation methods.