Fix up code analysis and tidy method interfaces.