Investigate broken functionality.

Rearrange test. Conclusion: not worth fixing until we also refactor
static checking in similar manner to IR gen. Begin that.