Merge klntsky/fixes-for-rare-types into master?

[ursi]

Is this branch good to merge into master? I have a project where build-index has errors without it.

[klntsky]

Hi, we need to update the Halogen app before I can merge. Unfortunately, I'm low on time...

[ursi]

Why exactly does it need to be updated? When I merge it and run it it seems to work fine.

[klntsky]

Done