More Millenaire performance improvements.Signed-off-by: Ross Allan <[email protected]> (commit: b73a9a3)