353: Making use of non-void setters

@sjaakd, @agudian: A quick one :)