fixup! Unify Halcyon commands