GoodieHelpers: Updating inline with GoodiePR #614