No functional changes, this is in preparation for the future to make replacing bits a bit easier - hopefully we only have to change the macro and not every element then. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>