This can be easily reverted or removed before this branch is merged, so I'm going ahead and committing these couple changes.