some cleanups, including insisting on FireTask objects in FW