Silence compiler warning and style improvments.