Improve 869466278b55 even more; it detects installs/updates correctly now.