Code cleanup for (#1) fix.