RF: Some simplifications. Thanks @MrBago!