Further manual fixes

[kroening]

• Each commit message has a non-empty body, explaining why the change was made.
• n/a Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
• n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
• n/a Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
• n/a My commit message includes data points confirming performance improvements (if claimed).
• My PR is restricted to a single feature or bugfix.
• n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

[allredj]

⚠️
This PR failed Diffblue compatibility checks (cbmc commit: 848186b).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/105543007
Status will be re-evaluated on next push.
Common spurious failures:

• the cbmc commit has disappeared in the mean time (e.g. in a force-push)

• the author is not in the list of contributors (e.g. first-time contributors).

• the compatibility was already broken by an earlier merge.

[allredj]

⚠️
This PR failed Diffblue compatibility checks (cbmc commit: 7a0968c).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/105543322
Status will be re-evaluated on next push.
Common spurious failures:

• the cbmc commit has disappeared in the mean time (e.g. in a force-push)

• the author is not in the list of contributors (e.g. first-time contributors).

• the compatibility was already broken by an earlier merge.

[allredj]

✔️
Passed Diffblue compatibility checks (cbmc commit: 8b3035f).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/105543693