Finish up work on #1044. Won't close that issue until updated test plan
is ready.