Fixed rclass macro to behave nicely with new hiccup macro