Clean up the difference between painting focus rings and adding PDF annotations