Revert "Revert "More Taffy Edits""

This reverts commit eb338dcc944666425180a4fe58ea077af1ec1c38.