Plugin loader tweaked to use less code.

Following up on our little geek session yesterday.

Here is the code (hopefully with all your tabs in place).