[#16] Reduce hardcoding in unflatten subcommand