[Button setup] Some streamlining.