Cleaned up spec helpers.