fix const issues causing some larger expressions to fail