goodie_helpers: minor cleanup & de-duplication