Check in the remaining changes suggested by Stephen...

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
2 files changed