Misc cleanup.

Signed-off-by: Rob Caelers <robc@krandor.org>