Ugh. Bugs were propagated by copy and pasting. TODO: make sure things ac...

...tually get a title. Partial fix for #882.