Restructure registered task factories to make them a little more
command-friendly