373.09 cleaned up canonical machine. No functional changes