General case compose properly forwards parameters.
Uncommented previously malfunctioning test.
Misc changes to reclaim clang compatibility.