Start of map module check style compliance.

Mainly aimed to increase record-store and map store decoupling.