Add separate functions for constructing holes vs variables.