Cleanup behaviors internals

Just a collection of small tweaks. Mostly just an easier way to leave thoughts, feel no pressure to merge any/all of them.