Simplify and therefore fix const access