Use slightly more uniform / less hacky helper functions, cc #238.
Use slightly more uniform / less hacky helper functions, cc #238.

mozilla/ichnaea,therewillbecode/ichnaea,mozilla/ichnaea,therewillbecode/ichnaea,mozilla/ichnaea,therewillbecode/ichnaea,mozilla/ichnaea