trac 14872: minor cleanup of spkg