Adding more const expressions where possible