Small fixes for LWR.

Things added/modified for parameter rewriting at tool evaluatino time that regressed when implementing message queue stuff I guess.