More updates for the move to HttpFoundation.