Simplified dynamic convert to not use call sites at all
Added more PS source file compiler guards around new optimizations, fixed build issues