The Instructions seem to indicate that you still use those same lines (10 or 18) to report the repayment if you are doing it on an amended return.

E-filing a 1040X may be easiest, but in the event you do need to mail it, the 8915-E can be a stand-alone form.