While I'm here, rewrite the install commands to use the macros.

Reviewed by (sort of):	chuckr