Mostly saves some code size and cleans up the code after Roland's recent changes.Please ack or nack.-Andi