Utilize make_shared more.