Simplify #337 fix.