(cleanup) Use generalized lifetime bounds to clean up 'static bounds.