Revisions to singleton beam handling, possibly fixing segfault problem