Unify demod drawing functions