Further code simplifications and interface (consistency) improvements.