20mar19

Cleaning up open PRs. Fixing fragile tests. Shopping. A fairly nice, quiet day.