Removing more boilerplate...