Handle more constant expressions