PHYS-16 #time 20m #comment Added some constness.