Apply suggestions from @toolmantim code review
Apply suggestions from @toolmantim code review

Co-Authored-By: lox <f5e96ceb240f4c6b121fe0445b266d7666b5fe0e@ljd.cc>
buildkite/docs,buildkite/docs,buildkite/docs,buildkite/docs