ACCESS: Minor cleanups of canoe code