Further expand typing in ImageBuilder#515

ZoogieZork wants to merge 6 commits intomainWarnerMedia/artemis:mainfrom

zoogiezork/builder-cleanup-part-3WarnerMedia/artemis:zoogiezork/builder-cleanup-part-3Copy head branch name to clipboard