The MAKEDEP/MAKENOTDEP hints should not need to be parsed as keywords, they could just as easily be part of the the same hint as the optional join.

e.g. instead of "FROM tbl MAKEDEP ...", you would use "FROM /*+ MAKEDEP */ tbl ..."