editions: improve edition-based building