[PATCH 0/2] fw_env: two minor code cleanups