Minor improvements to ThisSpec