Victim of changes. Fixes #223. Fixes #219. Fixes #216. Mabe other stuff too.