Minor cleanup

Small stuff... might as well get it into the tree. One new test case, some issue # cleanup, remove some unused imports.