Consistent define/deps usage