Handle both old and new style interfaces in source expansion