Fix bug in manualintegrate u-substitution

- New integrand will not contain original variable of integration
- Simplify and correct calculation of 'constant'