Code simplification + moved variable initialization.
Extended createFakeAnchor to avoid redundant code.
Changelog entry.