Add tweak to allow for extern declaration cursors