Make things a bit easier for people to find -- hopefully, anyway :) (And the usual sorts of while-I'm-here-type clean-up). PR: Obtained from: Submitted by: Reviewed by: