LP 1198465: Fix and improve void/adjustment code