Yea, this is a good suggestion really. The charged / non charged circuits are very similar. You're right, i hate having too many similar blocks under different names. :)
Ok, I'll check and fix this.
Hm, something we can consider i think. Good suggestion. Rusty scrap metal perhaps...