Simplified interface for expand_placeholders(...) function.

Various simplifications enabled elsewhere as a result.