Insulate build(binary = T) further.
Closes #557