Further AESinkIntelSMD.cpp changes

Thanks to quarnster and KeyserSoze1
Progression would not have been possible without their valuable input.
Further testing required but initial tests look promising, hopefully no
regressions occur after the changes.