Dealt with both of these comments in f10a7d9.