Remove element parameter being passed to callbacks. Update tests.