Reimplement flag elision