Cleanup #4004

As discussed, this corrects the behavior of #4004 getting back the old behavior and still keeping clang happy.