Add expression constant checking