Move more helper methods to helpers.py.