Cleaning up #9 a bit.