Operetta/ScanR: minor code cleanup