fixed copy/paste error in comment; fixed generics issue in 'with(..)' builder methods