WIP: more changes to ApplicativeBuilder