Make the self = FALSE condition a bit cleaner