add some constant expressions, maps are still broken