Code cleanup. Note that there may not be a context feature for inline agents defined in assertions (esp. invariants).