Changes to declared-inst

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>
merge

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>