More cleanup to method fork helpers.