After some research and comments from Paul Fox and Richard Smith (thanks!) I've revised and split up the patch. Changes: - calculate CHARGE_FULL_DESIGN based on technology and manufacturer - replace CHARGE_AVG with CHARGE_NOW - add CURRENT_NOW