Make more use of convenience methods