Extract code so we can fix parsing code

Authored by mlaurent on Nov 19 2019, 12:46 PM.