Last bit of cleanup

2 items pointed out by degasus