Abstract jso_location and fix parser inclusions