Small refactoring to restore correct ocamldep behavior. Needs to restore the
functionality added to the correct place.