improved expression const correctness