[cs-scoping] More prep for FPWD