Attempt to simplify/unify rules

As per #26 and #19. Comments welcome.