Issue #926: fix typo in prev commit + more cleanup