Fixes #5651: Use the same SPEC macro version comparison everywhere