Couple more tweaks to get short_version working.