Style fixes, minor update.
FIXME: new test that shows the unhandled use case.