Minor cleanup after code analysis