[Groff] groff / metapost labels solutions?

[Dorai Sitaram]

As is probably well known, the labels (btex ... etex) embedded in metapost 
files don't show up well when the PostScript file is loaded into a groff 
document using .PSPIC.
For example:
% mpost -troff lambda.mp
produces lambda.1
Inside a groff document eg.ms, use
.PSPIC lambda.1
The problems seem to be two-fold:
1. An extraneous % sign is tacked on at the end of the label.
2. Interword spaces within a label are ignored.
It may be possible to do run a sed command on lambda.1 to solve both problems. 
I can remove the extraneous % but it seems to leave a phantom space.
I tried putting explicit Unicode space to solve problem #2, but it doesn't work.
Any suggestions?
--d