Rework ConfigReader factory methods.
Build tweaks.