Added a missing conditional to the invalidation checking macro that I factored out at the last minute.