Removed more unnecessary lifetime annotations.