and another assorted usual janitorial changes
Signed-off-by: Alan Coopersmith alan.coopersmith@oracle.com