Minor drawEmbargoBox refactor