[0.45-PRE2] Improve tab-complete support.