be trimmed further, even). Change Matrix queries_ and references_ to arma::mat type, but pointers were required to make it work right. This entire class needs to be written in a more sensible and intuitive way. Still a little left to do in terms of removing Matrix and Vectors.