Based on review feedback, tweaked the patch to include edges that fit all other face loop conditions, but also *touch* a non-manifold edge (though the loop will not extend *through* non-manifold edges).

I submitted this.