window: Shift build() higher in advance of edits that would otherwise break DBU
window: Use build() rather than duplicating code from it