(Bug 215) Requested code style tweaks.