Modifications because of interface / impl XDR split.
Authored by: amccaf1 2014-10-17
Parent: [r78]
Child: [r80]