keys/expand-key: use the single string when possible
keys/{first,next}-char: indent properly, because Bronsa says so