I actually feel more uneasy about this change than the other. Not that this code was much more hygienic before...