I think we should remove it... even if it makes it a bit slower in flash, it will allow us to profile its cost if we need to do performance optimizations.