[Magic-HD] Minor code clean up.