Further cleanup core_renderer and reduce NPath complexity