Using a single draw works in my tests and I couldn't reproduce the issue noted in the comment. Also apply minor cleanup, assigning a variable before calling methods to reduce diff-noise in planned changes.
56f783d883