Fixing this encompasses expanding the SPI class but also the implementations - both in Weld itself and in WFLY.

Though I am not sure why we need those two separate implementations in the first place? They seem almost identical with only minor details which may have originated from doing the changes separately. Might be worth introducing a common abstract class in SPI?