Issue #213: cleanups.