Resolved #187; plus shuffled stuff around a bit.