Avoid calling get_prompt() unless needed
#1657
+37
−16
Merged