Minor cleanups to Assertion and update to parody.