Cleaned up use of this/self for #28.