Minor changes to behaviour macros.