Removed a few macro-expanding-to-module workarounds

Also documented a few issues