Minor maintenance of code from latest pull req.