With minor cleanups to make things simpler.

With hat:	portmgr
Sponsored by:	Absolight