NXBOOK-757 a few minor simplifications