Use goto_programt::make_X factories in two places

[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/
• 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.

[tautschnig]

I think this is good, but I'm still curious about the templated approach I suggested on the other PR. But replacing this one by the templated one would be easy.

[allredj]

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