move check_disabled after excuse/shortcut in prepare

  - the change stems from a seemingly broken refactoring in 35032fe
  - it resulted in an endless loop on a case where A depended on B and B was disabled
move check_disabled after excuse/shortcut in make

  - the change stems from a seemingly broken refactoring in 414bca1
  - it resulted in an endless loop on a case where A depended on B and B was disabled