Some refactoring, vanilla Debian changes