Trivial: remove unncessary volatile, add const