Adding 'f/bind-value!' and 'f/on' back in