Update use of Halcyon internal vars