constants in expressions + cleanups