remove a level of indirection on FW config parsing