Further refine use of before_install/install