Change prompt generation to be more compatible with the advent430 branch.