Simplify #377 fix.