More display-code isolation.