Refactor to use 'yfm' module instead of my
home-grown version.