#### Summary: Clean up as recommended by @betanalpha in the comments to #557. #### Current Version: v2.18.0