Tidy-up find_command code.