Attempted to improve instantiation of complex structures with limited
success.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>