Minor improvements. Don't return the set value from setters.