Fix feature specs that were broken by markup changes.