Some code refactoring.

Long time needed, to better reflect/limit the scope in which many
macros/methods are/can/should be used.