Better dependency checking.