+1 on that. This will simplify quite some code.