Refactor: Use util_diff to store common pieces of code, including a leftover check for followup