Clean up existing specs a bit.