Pedantic change for const-correctness: replace two calls to