phyber:
	Possible fix for broken inspection.  Also change where we hook some
	stuff.
	Improve set/get of options.
