A few minor experimental tweaks to make it work.