Yes, that's correct. For now we need to merge this code in since it's blocking other tasks (in particular, #13).

There's a separate issue to deal with this: #17.