Small npm usage refactor to lay the groundwork for vendored modules