tweaks for instances and conditions refactor

Signed-off-by: Suhayb El Wardany <me@suw.me>