Code cleanup.
Profiling instructions in Markefile.
Small performance improvement.