Fix OID collision
Whitespace fix
Hacky implementation - install outer slot especially

Fix up conflicting() varno in new executor expression
Style tweaks