Change In-frame flag from variable to macro