Reduce explicit branches in dependency expansion
Test default formula requirements against correct dependent