The issue mentioned in the previous FIXME also applied to circles, I just had not noticed. This is still not a prefect fix rather it just papers over it, but it now seems to render circles correctly.
>
]]>