Fixes a couple of minor code hygiene issues.