More efficient use of AMGCL + a bug fixed upstream in AMGCL