extensions: better handling of [with Fields] (fix #74 )
Also started cleaning [Fake] a bit.