Add second template arg to fenothing

Description is in the log messages of the individual commits.