Further clean-up patriciaLib code.