Affects things like train_step, test_step, various update methods and others.

Methods that consume these outputs have to be adjusted, and the new types should be used for annotations where appropriate