6232e3efc2
* Move/rename functions * Prevent overlapping calls to check addable definitions
* Move/rename functions * Prevent overlapping calls to check addable definitions