[needs review] Add depexts

Follow up to #1239 to make review easier (normalize, then add depexts)