Fix warning for unnecessary comma.
Fix warning for unreachable statement.