[PATCH 07/58] buildman: Move logic for -A up a little