So, should I just mark these as const? It's the "least involved change"...