Clean up two small CS issues introduced in #6257