More declaration_map refactions

Signed-off-by: K-ballo <k@fusionfenix.com>