Fix for use in VPAW 2

Also fixes some Slicer Execution Model and Clang-related issues.