Move definitions of service call no.
Fix type of "W".