Clean up static checker warnings