213-219, 227-233: It seems like you made these changes to conform to the arbitrary rules we have defined in HACKING, not to actually be helpful. It is really necessary? I'm fine with the approach you took at line 245.
405: add a trailing space
416: add a space before the parens in the log line
18: i18n support?
95-96: The indentation looks a bit off here
205: i18n ordering
213-219, 227-233: It seems like you made these changes to conform to the arbitrary rules we have defined in HACKING, not to actually be helpful. It is really necessary? I'm fine with the approach you took at line 245.
405: add a trailing space
416: add a space before the parens in the log line
446: Capitalize "choose"
465, 505: Capitalize "host"
738: You missed an object import